updated to support lollipop