Design issues fixed