Fixed cs, changed structure, etc.