simplified changes