fixed stuff for sam!