minor change & new stuff