added first line
merged changes