adding all the needed fields and shit