completed feature for v1.01