removed ugly forgotten globals