reverted to working version