a few changes more to come