Major changes actually work now