fixed, still need to include better output