New method and fixed missing returns