UP-4056 Incorporated feedback suggestions