I would remove this method