Updated with publishing stuff