Major improvements :)
Merging to update "temporal" app