2.0.1 update and messaging and button states