Cleaned up some more to reflect the latest Unified Plan