Add my earlier changes back for now