Updated phase change to work with gap timer condition