added amplify, merged conflict