clear all implemented
clear function fixed

Conflicts: