Change to use ModifiedBy instead of Windows login.  Also update sql statements to use aliases for easier troubleshooting