Changed names, removed some of Lars code.