Combined a lot of old source with new ones (latest public one)