Added some code to prepare

for upcoming account changes