updated to the latest version which contains some code reviewed