dare I say it's done
sams changes