Modification for version 0.2.0.10