some changes from sam