updated models & controllers