design is hard
small changes