Added EOF
Removed self-call