good catch on both accounts, well done