updated/cleanup of guard hoist