refactored
ditched RKWard and refactored