made choice of optimization
fixed merge