bug fix, removed debug output
got rid of switch case...