Updated with new setup file
Updates for work within linux environment