changes for merging with level viewer