Some additions from datazilla
changes from Datazilla