combined the changes