Changes mainly in molecule file