Modified for better visual appeal