Minimal changes to  method