alot of stuffs
merged