Changed syntax to a much more traditional style