move statement for cleanup sake
add audio support