Updated solution for 06