Slightly adjusted current version