Improved offloading with deadline timer + some bug fixed