Beta version before code cleaning