changed to use atom services