add changes from Clever first 9 months