moved firstPush set to correct part of ifelse