Updates by patrinhani