formatting and messages updated