Overhaul continued
Version bump