some performents improvements - part two