improvements on push (more trackable)