Making it live with current features would be good idea!