committing yesterdays changes - not fully tested yet