Merge with my last modifications