applied Kasper's syntax corrections