Can loose the old commented out code here