fixed sam's fuckups