stuff
Some merges with tg