o/c link some redundant stuff removed