changed things to allow future changes