adding some nice features