Updated Main/Fixed Commands