improvements
fixed merge