Overhaul for 0.3