getting crazy
merged changes