adjusted version again