Making it release ready