Modified with timeline 2.0 code for working product