updated unfinished handlers