Replaced some more functions with syntax