more code merged