Fixed NF issue and added completion alert