Eugene Some missing return statements added