moved some cuts around (suggestions from vincent)