some simplifications
removes errors
removes some duplicat calls