fixing some heavy stuff