changes to make things more usable