Implement changes on orchestral/facile@b5f227b

Signed-off-by: crynobone <crynobone@gmail.com>