performance improvments 

Bug 814203