Adapted to newest libs
Timeline changes (WIP)