Reverted to 0.6