Added time pickers, added macro