complete. tested with XE2, too