Continued added SU's suggestions