Modified 'Build' and 'Install'