Functions commit

this commit is not compatible with WP8