Updating various code changes