draft
fixed errors