added parts from connex and makefile