Modified to build with sokp