+ added some nice features