adapted to 2013B version