some changes to ease the process