changed more... doing rigth although still too slow