Updated solution + instructions