More strings 

Update from main fork