I think this design works better