Merged with Veronica code