Update # 10: Minor changes