Added timeout handlers (TESTED <- WORKING)