switching return values from last commit