fix naming issue with atomic; some performing issues