Not an ideal commit - need to check for fs20 conditionally