Updated solution for 8.3.1