added code in evaluate