creeping towards push working on both devices