Changes for hipikat, from forked user