A - Updated with bugfix and minor tweak to view vars