Edited for CircleCI config