This time with better tools!