checking in updates before some plotting refactoring