FIxed Beta v3.2