Improvements after testing
Final version