Added cosmetic stuff to work with new app