Init

Fork with fixes from thread.