3rd commit of provided code.