Feature/eb 1