Cleaning
Temporary fix for duration bug
Part order (group I and II), short 1