Update 2, fixes #1

Done now