Yes, this is little tough but I think you already got it right