chaged things to avoid derps