lots of new things added 100 percent
merged