Better discpline handeling