#196 Improving time pass form