Filled in some missing code