Simplified edate calculations