Added source
Added tap and emit