Uncommited changes
Made 32bit only