Some more changes3