added more cycpp stuff