isn't a return needed here?