Shivaji

Maybe fixed multiple module issues?