Implemented better output