New modifications
removed old code
Merge branch 'master' of https://github.com/sammy11111/fa