Changed a val back to a def