Scrapping for a new design, see v0.1.2