refactor
merged brenda pop over stuff