commented out current changes for floating stuff