17.04.2013 ---- Added new class for 9.3