now includes second function which solves w a dictionary