Took out unnecessary code
Update names to reflect Revised conventions