Redid some prevoius changes that was overwritten