Merge wanelo's stuff in this-a way