Re-adding changes that disappeared from github a couple days ago