Modified to a macy version