added FGs and mereged panda commit