some mroe changes