merged more changes