ticked 141106 done and added code from class