reverted to a working version