Updated so it runs over time