Updated to be compatible with galaxy-dist-232ef8122d54