Improve slug system