Minor changes to the method impl