Updated format a bit and added new details