Finishing revert of 'where'