Updated version to v18