Added features to new merge