added stuff to make inline editing easier