Modify for use with Chronic kernel