Removed duration check