small changes, need update sheller