Final Prop Changes (I hope)