bring inline with jellybean changes 2