Filled in some gaps