20131226-07 main functions updated