Improve deck system
Merge amend