Replaced the lbl and cmd stuff