Improve atom compliance