CODE CLEAN UP: added missing @Override annotation
Improved FR Messages