additional field checks added