Updated to be friendly with eclipse.