Completed CE2

Not with comments