modified for proper formating