Trim the things I've removed and expand more functions out