Updating with latest changes to code