Added relative-time disactivation & code reorganisation