Remake level 1 to use new construct