J58 fix, Atar added