modified models & views