Changes to get colour updating