Timeline code OK. ready to merge to develop branch