Add modify up to now
Start mergin