updated for XS 6.1