- fixed stuff