Adding new fields and focus on field that was a right pain in the ass