Commented out code and enabled buttons to push bug fix for Tom.