Update as of v1.3.3