updated assignment + added solutions