Speed up + correction + remove useless things