added others modifications