Starting work for 0.6