merge work from before github registration