Some Code Changes