Final version

Everything works as intended