Basic design resolve #8