Removing the file extension and legacy version, also bug fix