updated for Connect 2.7