Final version

Working wersion