reformatted to use simple connect pattern