[WIP] Reflecting latest changes (2)