Corected all points