improved performace

a bit ...