Moving old code to depracated