Works now, and actually makes sense