Migrate camera to tap

Waits had to change due to timing of tap