Enhancement 3 & 4 re-implemented