made changes to iclude functional forms , from hacking hours session