updated with more modern output