fixing James' suggested things