set interrupt in correct places
update version