Final version - little comment upgrade