some changes to facilitate deck management