V0.0.0.31 - additional changes