take over more code from ticket