Improved gdb_modelling.