Updated for windows phone 7.5