made joestone's modifications