fixed stuff maybe