More commits and changes