added fields and some card nonsense