Tested and Updated all Methods