Changed method names as directed in the TODO lsit