adding little bit of structure