fixed samuels crap