:thumbsup: Import diff functional and unit tested