some changes
log-29-12-14