Change wait method to not use waits