Added colour state and messaging