Now with function call and less indent