Added current grade
Make dead day reference dependent on referrer