from sam

I dun some stuff