20130404: some modifications