Removed dependency on calendar