remove this from this method and methods below