13/01 v1 fixing problems