Working on fixing mutations