Got rid of the extending and extending_for queue, keep it simple. Each second it will check if extension is needed, this should do equally well with simpler code.