Updated with James' changes

Did this manually