Rodrigo merging with master

merge these methods?