refactorig stoped by my son... next time will be better...