putting in changes i pulled from the merged master