Perhaps consider adding logging at the end of this method as well?