Improve auto rageshake lab feature