Added latest changes (too many things to list)