Updated to the same as beta v1.1