Quick improve for testing purposes