More work on the mass kit selector