Added all keywords and organized order