Dan's changes after fuckup

asdds