Level01 improvements