Update: Change into point form