New social & tidied code