added queen handling