removed the optmization part to "optimize" the speed ;)