cleaned up previous prototype