modifying to add self contained build