Output extended and improved