Updated solution 11