Initial commit for improvements.