updated by Maarten: 'project' parameter is removed