Swapped 0 and ^
Pulling some changes from master