Improved coordinates. Refactoring client side