simplified the changes