added: missing return statement's