lmk: merged updates from neobuddy89