Composite with updated branch. Creds: https://github.com/fanzter/gm