corrections to previous commit. Works now, promise.