Using rack we no longer need the additional work around