Change methods  design - back to void return type