Good(second) version

Work now