Converted to mvp using pakhama