Updated main so it works with the current crop