* updated to latest floor changes