changes + new stuffs