modified version to 0.1.2