Changed a little bit the design