[MISC]Make use of new functions -dependent on commit 63ee9bf8a2415c10e4dde2c3dad513b9bab25c0a