details
details in the UI
changes
fixed merge conflicts again