Added code to place suspended where possible