add some features :)