Feature/updates2