push/pull mistake, changes based on prof comments