fixing some heavy struff