accidently reverted to old code - fixed