Extending the POI functionality
Removing the changes made for testing