Giving up on my branch, copying Schischu's branch