Updated for better terminal use