Incoming changes design fix