Doing this in right dir makes more sense