finishing the assigment in the last minute :)