time signatures instead of predefined measures

Also expanded sample song