changes and then.. a few more..