classes connected, feature 61, done together with Martin