Incorperate more of Joe's changes