Return statements added