Fixed network functions with firing
see #4