Removed dependancy on timeliness