New rail safety legislation likely coming next year