added * and fixed firstname lastname issue