added custom time block
merged custom-pick with master