More Code and fix