Changes for better display