Continued work on Timo's changes