Changed up objects for simplicity