changes still bugged as hell