i don't know what's going on here
pulled esther's changes and merged with old version