Upgraded for Ghost 0.5.2