Updated for easier testing and new lusty