change on design and new enum