more optimalization again..... pfff