tweak to design
fixes conflicts