moving to the fields
adding correct annotations