added code to c and added d e and f
added x y z
merged auth into master