I should probably check my code before commmiting
mistake in parsing fields