should be using pop for a clean update later