updating
fixed merge problems