made some changes, going to merge