Updated to not use instance variables in partials