Slight mod to system view