Updated to handle Aces