fixed/cleaned up problem 30