Merged with part of Firefly 1.1