Updates reflecting latest changes