Changed delay names etc