New opk with recent changes