Initial fixed code commit