changes based on Bens comments - tempoarary