FINAL final changes