Further changes for github