Code and Fix

Code and Fix