Updated with maple leaf
Refined some logic