Continued updating the refactored design...