FINAL Submit

Now it is working correctly