Cleaned up master for the coming of RapidGame