Redoing other small changes reverted