removed some fields I will not use yet