Local changes to get rid of pivotal and enhance this thing