redoing!!! will update when finished!!