Merged some old stuff