2 helper classes fixed