updated model, removed duplicated stuff