Updating for 3.6.0