small changes because of assumed deadlock