modified for better display