Changed my mind back to native approach