Completed implementation of Stage 4