updated some changes mised in the past