New version for testing on Bas' system