with stef changes