Added nickname
Made pretty