Version2 working

implemented