Added keep alive
Added more goodness