Dev 1.1 Second Pull Request

please remove this line, it's not needed since L61 will just overwrite it