I put a little bit of design changes