fix bug and new emp q