added mads
showcase fix conflict