Added return statements