Better period handling