Updated to include jameses changes