Severe design improvement