description added
merge with previous changes