Changed buil to 19.1.0
More refactor.