New version with keywords