reverted to working version.....