R2 related Floor changes are done