fixed stuff probably