Big improvements B)