updated versions, small modifications