adding all changes from todo 15082013