Changes to try to fix code

Trying here to actually make working code