added some features ;)