Some incomplited changes