Added misc code