almost working...
merged
fixed