Minor changes
Fixed conflict
No idea, just need to commit
Fixed merge
Added r_stacked line