Major improvements finally working better