some mad changes