pffff, some more optimalizations