Improving the code

Addint more features ;)