Even more dynamic UI
resolved conflicts