8-7-13 Code

Bo's Changes