Fixing issues up until the 11th July