Re-added steves original test