reverted to newest code