Modified for a clean up.