did it now
merged stuff