Added skeleton for testing and map noise