re-base version 1.04