Pulling updates from sammyd