some changes (with errors :) )