Contributions from @funbox

Contributions from @funbox