timo's changes
references working
more references