fixed 2AM design errors