finished off changes