Implements Enhancement #4