Feature/diabetes all shinetech work