some more cahnges