Compatible with 315 1 cleanup2