Added more return statements