added partial rapprentice support