updated to support 4.2