Implementing changes agreed upon when reviewing PR5.