IC - Added Timer
Merge https://github.com/Koutyboy/cloaked-hipster