Third stage of #4