added multiple missing returns