Apply the same changes to wp7