added features! ... :D