new changes per wook's advice