removed some legacy sample code syntax