just rearranging again - moved outside of findOne