Changed method signatures and added return statements