committing for merge
commiting for merge
updated functional methods and website flow