updated for sdk version 21