converted some more statements