Changed files

Changed and improved the code! ;)