Fixing ^2 changes