small modifications
a rewrite using neobundle