fixed stupid error and removed orderBy until I unstash my stash