add fancy
fix conflixts