working nice! changing stuff now