Added check for not duplicating calls. Also re-enabled debugging.