fix_me feature updated