Timeline.java fixes

Changed Timeline.java to use one mapping instead of 3.