Merged the new and old