changes after Westkans feedback