wrong methods removed
Merge branch 'refs/heads/jan'