updated to ver 0.6