first take at changes