Converted to using vector objects