re-factored some keynodes