Changed values to atomic