added beginning of timing and storage systems