push pop working better