Revamped for use with and without ActiveField