Fixed James' Problems