Re-implement the previous changes except this time do it less stupidly