Done. Its now taken care in the JS part