Updated to use the homescreen wait.