Feature/alpha0