Feature/diabetes new