improve shuttle results during ugly hack
correct pink schedule