added random + calendar
merged