Changes made by Relvis Gonzalez Martinez (relvis@floorsightsoftware.com).
Testing...