merge @codedance's latest changes into @soniah's repo