Removed date dependency;