changed things to make it 12-hr clock friendly