Updated to latest development iteration