Added new check to see if we're using the local or development machine;