Merged more changes