Fixed bug and added push