after lecture
explicit fns
fix merge