updates from dev-p880