This might work, revert to old logic