Updated to work with lollipop