Fixed output, added map