Move this to initial connect hook