updates from mrbirdman