Sepearted into 2 programs and added proxy