Better design (32/36)

Better design