Updated version to not pull from file