Build after improvements