Necessary changes for Solo