major type simplication and overhaul