#19. Change interface desing