customzing bit more. Uncommented to stop some debug poo