More improvements, it can go live