minor changes which were commented out durring testing