Misc. Changes for User Study