Some optimalizations....