added remaining methods/return statements