Some more changes new