Made everything amazing. And added names