updated with full names