still better fee handling