uncommented certain lines for testing