Add initial floor re-write