Better design (24/36)

Better design