Some updates for better output