Feature/beta0