In progress to version 0.02