make sure to make these changes for java and python too