You are right, gotta rewrite this file eventually.