Reworked a bit the calls