added support code