upgrade shervin and gajeta
adapt to upgraded shervin