added push and pop parsing