applying updates that have made with other projects but had not gotten around to doing here