Restored and fixed up some