Feature/beta2