Updated still need to work on comic stuff