modified for proper format