Some bugs fixed
cloned