Fix of Initial code commit