Changed model a bit, moved to the research