As requested by Andrew, some modifications were made temporarily until it is ready to go back as it was