Add support for Michaels minor request