Performance increase #2