Fixed previous merge and added arrow assingment back