Some more changes for u